Merge remote-tracking branch 'origin/master' into feature/android

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/os.texi
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/xdisp.c
Simple merge